//
//  ViewController.m
//  FirstGit
//
//  Created by 付鹏举 on 16/4/6.
//  Copyright © 2016年 FuPengju. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController
// 搭建
// 哈哈
//冲突
- (void)viewDidLoad {
    [super viewDidLoad];
    // Do any additional setup after loading the view, typically from a nib.
}

// 功能1
// 功能2
// 功能3


// 功能4
// 功能5
// 功能6
- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}

@end
